Merge changes from topic "am-1c1ef10f-e9e7-4a5c-940a-9d920d755bb9" into oc-dev am: 403f66c759
am: ef323456fd

Change-Id: I270556af4bc8c972875aa9b74bd9e79151cab707