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

Change-Id: Idd855b22f834f7842647c57cb4ef3a8462f035c5