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

Change-Id: I4e5befe2b190512c55e11d429aa57fa9132a5080