Merge changes from topic "am-37ab0897d803452791072eae772298af" into oc-mr1-dev-plus-aosp
am: 609495e298  -s ours

Change-Id: I82d29485a7d36021850b2e43068afd8671cc36ff