Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev am: 0adf6e1981 am: 6b2064e5c6 am: 36e63c9337
am: 26fb62b0aa

Change-Id: Ia6f8adfed9cdcfad1330621c35c4cfeecd21fa7a