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

Change-Id: I836fb48494a5faf34f26e37b441926a6c97ae73b