Snap for 5304822 from 5e84510dfff73b2559bdfa6b5035cfa677d87d25 to pi-qpr3-release

Change-Id: Ifb0dc9004d46586ecce68197867f535150b3ed1f