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

Change-Id: I3aff5ea4bcfc5da7eb56a89fea74691773760bc3