Snap for 5044688 from edd01fd394b93813dca427f29f1f0a15dc19709a to pi-qpr2-release

Change-Id: I4c037ddb3ca7e59b077a56aa3176474db43c6379