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

Change-Id: I7c0619268375667560e2a6ec6665436c1be45812