Address some review comments for aog/403114

Test: test-art-host

Bug: 62040831
Change-Id: Iceefdfde26f1b5feb8d6a5121ff64c12702d476f
2 files changed