Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754
am: af687adf49

Change-Id: I3885703da8f3f7bfe6b72c25d1f3ed19d6aeac9a