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

Change-Id: I916fd6ac3a9a567a76819fcbbb1daf88ed52ae25