Followup change for ag/1373399

Change-Id: Ic8946ddf68b4db85d312504cffec5aa9f61fe806
7 files changed