Merge changes from topic "am-896be361-a4b1-43e7-b1d4-8f471894d3a2" into oc-dev am: d5ea04a874
am: 816c77b132

Change-Id: I6f430dedc3ae9795778a91bdfbb8bf62ce73a316