Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release

Change-Id: I2c413e1453780cc638e2712975c1aad66904b004