Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9" into oc-dev am: a9e5b5dce0
am: 7e01400018

Change-Id: I863476787647ddcb16e5e0587d0c06a755cb0e07