Merge changes I394a7920,Ia847118c,Ic8396eee,I79a85c33,Id015e6a7, ...
am: 1d5b102671

Change-Id: Iec6ef1c08a1aed08e9376c367a6e69f8705a8518