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

Change-Id: Iee7235636fb7f4386a871f7278264fe250841203