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

Change-Id: I2243b2cefae86d41f3db1697dc980a64c29309ce