Merge changes I1a28c21c,I02faec3b,I16a2050b
am: ec5d6cb8fd

Change-Id: I77a30bdf59ae0ec156d8ab2b9ad69b050e3e9ec2