Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release Change-Id: I04b66f3e9390c438a6d6c404b16adfd607f0fc53