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

Change-Id: Idf68376883e0821c398aae9449f6703a494d4886