Snap for 4937098 from b9e822981c6f0204d7d592ae0438b7c3ce8ba0d1 to pi-qpr1-release

Change-Id: I30d14ee18f9955a17c760e59b7fd3128556a2bd8