Merge changes from topic "am-a7446a6e34814019bac9941d457e9acb" into rvc-d1-dev-plus-aosp am: b6f71a6f43

Change-Id: I942a2911c7fb699becc377eafe246f00497921f1