Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into oc-dev
am: 59113c7a51

Change-Id: I8111a46aaff0d20c4f1cc51292eb9567b196a5fa