Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into oc-dev
am: 7af053390a

Change-Id: Ie90797e6c620819b92b2bd32ad8a07363fbee947