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

Change-Id: I899696a771fab66b114454692efb51822a1620e6