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

Change-Id: If66745da48c4afd44e37d3da344f4d89e08c7ebd