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

Change-Id: I3cf23dd424a8bf73d9830dd8197957575936d21c