Merge changes I38b16291,I159669ec
am: 08601a494e

Change-Id: Ica496628e64f2d218afea5ad8917f3d814266e07