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

Change-Id: I2b119e4d12aebe29087b7db1c8c2b72bf92f7645