More 1.22 -> 1.23

Follow-Up: I1c2d7bdd1d861ace3f7e7bd8f8f0047c31194446
Change-Id: Icc3d612d401c7c2a91678a4a5dc4a228383452e6
Merge "More 1.22 -> 1.23"