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

Change-Id: I117d15dc0168ebd0f09835957e4b1757a1ae5a7c