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

Change-Id: I791fcefc124baf7003daf74137b85d954005dd31