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

Change-Id: Iaa0dc1969220f7106257b342e2480752653ddfc2