Merge changes from topic "am-51ece5f56d8c46af846b6c196e11a86b" into rvc-d1-dev-plus-aosp am: 8eb9e43457 am: b535dd509e

Change-Id: Ia42f6940ae17ec8d3f36b3978ab9fd5ca2240015