Snap for 5044688 from d6cbf3f41d7cb54e7dc62f4c29f7a7cba05aa28b to pi-qpr2-release

Change-Id: I962d0906585a4643f49f52d6a0dbd7bca7785536