[automerger] Revert "Merge commit '169fcb0193b2e92c8a8044647393f6f4d07ed144' into am-6752d344-de2b-444c-b5eb-e9fb8dae5d03" am: 97f475f92d am: 95720e5652 am: c86df3b340 am: 0227e40ac1 am: 17faf90417 am: 62e8e6fcc9 am: c3034ec5dc
am: 74c8913399

Change-Id: Ib26687a5fa4f66142fa6930ec0e859eb3e5621f1