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

Change-Id: I098c224e8646e610dcfde3eb5ef018f651bc8e34