Merge changes I73637476,I5a94be6c
am: d6705a0586

Change-Id: I701b77544249f845d61be0fcaef0191c2772e6ff