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

Change-Id: I30fa6094e7bf2a9d8f6f57f64a359f896c472fdf