Merge changes I8d0f5341,Iced0de7c,I742cd614 am: 7b46197bc2
am: f59395aad1

Change-Id: I8884f855d70ba41d00a45dadcac2afe92eb2ea56