Follow up changes to ag/1627041.

Change-Id: I376ab5a26ff98eca1cda6a9e43f47e666e8001c3
4 files changed