Snap for 5249487 from e60e0d22916bdf6af214b2f3ff0237b6daf71ac7 to pi-qpr3-release

Change-Id: I66b0c764953c0ecc350357a544e60ebf596a29ff