Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev
am: 3266dbabf9

Change-Id: I7cb706927b8b155820c74d8c8635b4b0fac377d5