Merge changes from topic "am-bcb09242-ce3f-453e-a1ab-496ff9dcb274" into oc-dev am: 73c9deaf77
am: 67952b520e

Change-Id: Ia5bf8aea4c30ef91f056e56de74f0ccceb3b7e82