Snap for 5322077 from ebdb4b921ff0a71b1fff3a6f797d60875dbd06e4 to pi-qpr3-release

Change-Id: I7c9b117957c1d06f13d7f82d98b1adfae4634416