Merge changes from topic "am-4d17ebff84414d57b75277e887e299d7" into rvc-d1-dev-plus-aosp am: 8ad10d6f am: 2ebacee3 Change-Id: I17a3f38af375d7172b987f1fa317206dfc46935d