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

Change-Id: I328f4f1ce555cae59579bde455fcce39508fadaf