Merge changes Ia67fd60d,Iace0af9f
am: baeb854d5f

Change-Id: Ic3e580b9eea9fa438d214617cf0037bfedad54b9