Merge changes I4bbb21bf,Ie79b46cd,Ia50aafc8
am: 0284f43d62

Change-Id: Iff5cdb66a1fa0c3a96da5829313900e07f0dd8b8