Snap for 5322077 from 3b87db2514cbb822c89e49b09a5da8ae3d0474f8 to pi-qpr3-release

Change-Id: Ia2d106ae3b8c2158e57ac5e332bee5a6a69c3ec4