Snap for 4927333 from bd9e36bca483a5082e4017cf0c2ba9a6fa7ddb40 to pi-qpr1-release

Change-Id: Ica11fd070d968ed890d16b7d5341d3f1a78bff6e