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

Change-Id: Id9555bd1fed41e807cc34364ee6fdcad3864cc59