Merge changes from topic "am-a97f4ff5-713f-4b52-a530-14cd9e746f00" into oc-dev am: 81994b6133
am: 88a63c8637

Change-Id: Id468001457e247863b66e2990659b34cb71206d2