Merge changes from topic "am-eb46eb48-7a23-41b3-8b69-98a255b23038" into oc-dev
am: db52df1433

Change-Id: If0c7001adcd8ecb3993e51ababc203ae0a6cdfcb