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

Change-Id: I69385d69e0f717808bb58cf081dac33cc6362b44