Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release Change-Id: If17b93ee23aeced3e102b3b6218338662adc8c8e