Merge changes from topic "am-5868f344c1ce47c590547b3cae29e970" into rvc-d1-dev-plus-aosp am: f5350e0b am: 16280426 Change-Id: I3ed4577bb849e3441c23630ae289611179fe0d2f