Merge changes Ifbeed546,Ia283252d,I28c85736
am: 288a675fd9

Change-Id: I76a5ca00eb6edceeda5da76c1d00faba08533b58