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

Change-Id: I5c241e908bead9324803661ec08e04c5b9988552