Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev
am: 57b2e38837

Change-Id: Ia168d6b5a5dba2c768c62de8548400b6937c1692