Snap for 5115288 from ef4599d15797283592d0f82fcb03ab3d1e59111d to pi-qpr2-release

Change-Id: Ief582d08a6f9fae1b4b9c55e18bf83de07b1ab49