Snap for 4959688 from d647aed393ecb173ea4eca604613e5d0ce57ccda to pi-qpr1-release

Change-Id: I496d6340ec39d0a6dff9594d7ecb83604a6a0759