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

Change-Id: I49f1858f7512b43104f6815a5101d7978780f55e