Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release

Change-Id: I74c62e52ceed7a79318da18410818114e1281777