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