Snap for 5140444 from 81fb83be41f270d99bd623352d3646aa5a416fdd to pi-qpr2-release

Change-Id: I20ec1862adc9f2b10d1be867e00e56a8380146be