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

Change-Id: I538d96930c9940965ccd94b81903cf30e5f25ae9