Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev
am: cff099466e

Change-Id: I173094597612750f9c4645236ddeb972aa5ad7c5