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

Change-Id: Ic3aabfb0964522bda9a4ba1c1b19fe2c84ac28e0