[automerger skipped] Merge "Revert submission 1182953-1576003954286-8455af5a" am: 06675f9106 am: 78f50dfb15 am: 7fa8a170b7 -s ours
am skip reason: Change-Id Ia925fad255fec002cb3d5c66ee41394d6355df2d with SHA-1 edabc01c5a is in history

Change-Id: I212bde7f16de2357c914480ba1a0533b85572e70