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

Change-Id: Idbb687b331486e4080f3b32f23e79138116a23a9