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

Change-Id: I81c31c5a0be3159514de39492c267c5276cce9f0