Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev
am: 07a485743a

Change-Id: I0ba4a71037e5bac19a540320665446b55b7aafb6