Snap for 6955225 from 64340cca97afb8c1515c7a740c96d83c1f3355b3 to rvc-qpr2-release

Change-Id: I9755f7ceb9618fc9bdcbc553a0e73272414bfc98