Snap for 5115288 from f6b838ee897765136cfd45a24da1f09f691155f5 to pi-qpr2-release

Change-Id: I9f8d59d8f2f9c352eccedca2f4d8761b70f40356