Merge changes I3cd68e65,I837596e4 am: 01b3b33248 am: 5f861fba96
am: 929c5f86a2

Change-Id: Ib27a41f174db6a3db16461d686112a696618eb8d