Merge changes I35f8843e,Icd2a94f8,I6c20f3b3 am: 1f1a0009fc
am: 1c8ecd77cd

Change-Id: I84b695eab24839e8aa40bc7b203d6ed584c021b7