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

Change-Id: I3ecb7320ec220c09e76f8a87dbff5553377425e3