release-request-319cd093-b0d8-4b32-b6ef-e921d10edf73-for-git_oc-dr1-release-4012016 snap-temp-L54300000064339674 (snap-temp-branch)

Change-Id: Ie487b5920550cdf15fe124e8684f714ce846de13