Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
am: f82bec9095

Change-Id: I738e54ff8723ccb7f156b9b7caaa4eab981d3c81