Merge changes Idbfe48ea,I1ecb83fd am: 07495e23b0
am: 58695f33d6

Change-Id: If63654d168cfe22e3db130a31ec5ccf004233100