Snap for 5447620 from 24298e143028dbae661488c604e537d3556d2267 to pi-qpr3-b-release

Change-Id: I6a603608a8dbe11ab0ccb9589bb18c43d63033da