[automerger skipped] Merge changes I5c5c4eb3,I36712447,I5b78d449 am: fd5241f120 am: 2d5bf0b845 am: 8b5ab0fce2 -s ours
am skip reason: Change-Id I5c5c4eb313fd42317a2b0feed0946b8e4003ad62 with SHA-1 0d75aee571 is in history

Change-Id: Idc6be68417fbb17744673eb4c0e2a8fb71ee959a