Merge changes I7f697d1d,I60f47a48 am: 6c10141800
am: 7f4fc5e385

Change-Id: Ie5dd02d310f3ccd84f5f1134f4cc8a86c47aa68a