Snap for 5135467 from 4c3137a9d3fe39d09aed664c0405bb219591cc90 to pi-qpr2-release

Change-Id: I062951f9308b3ddc7de447378371b5d3cbfe6d2e