[automerger skipped] Merge changes I4af73809,Iba6a564a,I3305b71e am: 5640e1d836 am: 91ccb1b309 am: f96069b311 -s ours
am skip reason: Change-Id I4af7380917fd2808bd6774b86fd4991485d6bfc6 with SHA-1 5141f3790e is in history

Change-Id: I485fef66d917b5fddf6c0667b201437beaee43e0