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

Change-Id: Ie49036a6919348041a82750d813cff10dd199a6f