Merge changes from topic "back111085900" into oc-dev
am: f0095ec4d6

Change-Id: Ie563f7c17a201dadfe8a6696d2cf99aebc07b855