[automerger skipped] Merge changes I52ac80f1,Iba48c173,If0a71607 am: cfc08041 am: 4c879b0f -s ours
am skip reason: Change-Id I52ac80f15d8efe152dea81b75a82faa4da1b8600 with SHA-1 d5d442dd is in history
Change-Id: I691e18e3e971111fd91be39af66e0d4c80d4c6bd