Address missed amend

Forgot to amend after addressing code review comments.

Bug: 26990650

(cherry picked from commit 3cfc2e4fb6c4735a145aa184db14d0bf33653e33)

Change-Id: Ic8483a50e0670cac1291385a82b7c5e4a313cd18
2 files changed