Merge changes Ib37508d4,Ia46ac30e
am: dcd46870f2

Change-Id: Ia8501ad3f5fbdabfe1d5f7d25f0a6f350e860643