Snap for 4939496 from 270e90f033dd412206697e3a27aee76c24038c33 to pi-qpr1-release

Change-Id: I58c840b601d31afc4b161d62a28052f71460e906