DO NOT MERGE Retroactive feedback

Incorporating feedback from ag/470934

Change-Id: I5338c2a9819b9c1c741f4bd97cef9cfef118c0e1
(cherry picked from commit 17ff6d32785b726b67fd3ac18e273651f15f59c0)
2 files changed