[automerger skipped] Merge "Revert submission 1182953-1576003954286-8455af5a" am: 69123d7a43 am: fb4c1638da am: 3d194c89fb -s ours
am skip reason: Change-Id I0e38482a8189688660e592ebcfab3d841385a02d with SHA-1 d4ee4f4d9e is in history

Change-Id: I86afc4ea012f53c9c329624f9642a53c871fed52