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

Change-Id: Ie8fe3c55abef97c0f51c029d7f31849b6fa3560e