Followups to ag/1553792/

Change-Id: I82f740df648f7fc3657c58fda972d3fdadc01622
7 files changed