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

Change-Id: I9faa697ab79eeabe261377e29b61ff31202fe0dc