Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am: 8e5ec12799 am: b6eed228bc am: 557941309a
am: 46984ff82c

Change-Id: I58ebdbc14901edf9bd8678c7114a49ca2a0a209f