Snap for 5073521 from a9aca04c647757bca9e4d008e240a964cea8c67d to pi-qpr2-release

Change-Id: Ia23db33617e4041791aec3fad269f080e5a43f23