[automerger] CTS additions for b/72165027 am: ff050b2f am: a3dea98e am: ae9ecb64 am: 6233ebb8 am: b2fcb329 Change-Id: I99161b43b2b4429f1cc50903d6b25d2e277e8b82