[automerger skipped] Merge changes I7065d081,Ic7c3a331,Ia432057b am: 2458be40f4 am: 172d2ce499 am: 06c8108318 -s ours
am skip reason: Change-Id I7065d081c11bc606d691f76ac8b499dd075d6504 with SHA-1 de933af7a7 is in history

Change-Id: Ifa5a0b23acc51bc01d480046a4354376083ff84a