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

Change-Id: I3928e7364f73369f86fbddbb5d23ecdb57c235cd