Merge changes I69e6489d,Ic17d52a7 am: 98a6db5c9b am: 5769061fe1
am: b74b5571f1

Change-Id: I5cf3b58bbfe432181f4237c449adc19bfbb48b1f