Snap for 4954419 from 2e2dcda172a4523be095c21b07be78b6b211143c to pi-qpr1-release

Change-Id: I55b2c2598e94e1999617e95a9ec0721b5dd33918