Merge changes Ia8f83a53,Ia1f6a659 am: 68f2e9cf1b

Change-Id: Ic7cd4c89c3687cacdd18637253cbefa9d67dd286