Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev
am: 378e6c244a

Change-Id: I0cb3e214777a0ed27cd21e9008e379a5af0b5be7