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

Change-Id: I6f655b08c4f657565b17d20d15ffd3f99eaef353