Snap for 4951295 from e4776c4255ef874aa06c783abdb599942d893970 to pi-qpr1-release

Change-Id: I007a43ed94180608ae006b0d9ee191f3d8299a68