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

Change-Id: I9efa98649f303c655eea58ea87dcc70fe2d58e6d