Snap for 4916303 from 992d47a237b1e2c8ca5d301397a0525f17252497 to pi-qpr1-release

Change-Id: I9e6d882649e912cd49d6144d077d4eceed0df84d