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

Change-Id: Idb30b6536f60e6e8f02b84a9866254a22582246b