Merge changes I836d1abf,I5f2c2bd7
am: 87d2fb7aac

Change-Id: Iea2673481ff627124ca4a5b18c159b8111a1431f