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