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

Change-Id: I3fe0bc03cef4e828d44b3675c07f1223f63fd4bd