release-request-31f776a2-f093-4abe-9235-1702f8bafc9d-for-git_oc-dr1-release-4054002 snap-temp-L42500000069020014 (snap-temp-branch)

Change-Id: Ie9316bfdfe7d855aad45298da76b0886888c0230