release-request-2c066723-15d1-45c9-8fff-fdeca41661a9-for-git_oc-r6-release-4286358 snap-temp-L42700000096612204 (snap-temp-branch)

Change-Id: I51a0f679a9b99417f7b971785757758b8bde5f44