Merge changes I722d2c41,Ic216ddef
am: c4ad6b6adc

Change-Id: I773f941918a21118eddc09d59cdc667fe22833eb