Snap for 5044688 from 31703ca227562d88d900d0bd1e41d9c5460e38c3 to pi-qpr2-release

Change-Id: I64f8414f3c25bb9ab23d2c6ee0c8e3e2f7847886