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

Change-Id: I3eed03bdd6515f32bb419fee9a9f9af9367ab424