[automerger skipped] Merge changes I0699ed67,I58293973,I9c795dcb,I0b731d10,Ia2097345 am: 3acc7dc1f8 am: 2c20415ee8 -s ours am: 48d6c73903 -s ours

am skip reason: Change-Id I0699ed6703e48b6c4bc0e7a392b79c12770f04c9 with SHA-1 678a10600c is in history

Change-Id: I9508df8eb88109cf5aa98e6b1aad9fd0c37bc5d4