Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev am: ecc48fbc96
am: f56e704fb5

Change-Id: I1f7f271c666fa52be7eef894cf2fc225780113fc