Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
am: 0f8320f6b9

Change-Id: I7f71b2eff90d4f6088640305f64f25b4f166466f