Merge "More CTS for APIs used by Mainline." into rvc-dev