Address comments on aosp/1539753, aosp/1542487 and aosp/1547496.

Bug: 173331190
Test: test-only change
Change-Id: I475502fde55d24e7ae3f7fe9f43c54740c57a9cf
2 files changed