Merge changes Ib4f6b1b4,Iac340c25 am: 4c0eb48014
am: 29f2fedccd

Change-Id: Ide406a453d2e513654fc56b27042a195f35ec50e