Merge changes I1d4db176,Ifb931a99
am: 4766f2cd27

Change-Id: I43d568f3ff551c2d69b25711ebd22bd7b651b562