Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev
am: cec93100ea

Change-Id: If8c2cd293875724b99a5177c7235ffbeb64c396e