Merge changes from topic "am-f68292c5-924d-4ea1-a564-0204d183ddc3" into oc-dev
am: 38b4ff9fea

Change-Id: I16269a7fb554a758c2a5f271d214cd5ac55d2274