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

Change-Id: I4c1fe63b943e8fcea398e4f3794ee676095d4853