Merge changes from topic "am-3bd7761d-0a22-43c4-98aa-44bfc62874ad" into oc-dev am: e17682a20c am: 6c5e30f60c
am: 4d4c461237

Change-Id: I890b8b24b4af583b258f008be469dfb178375cfb