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

Change-Id: I0b1b67914eff36935f34baa32434efece2c4cdc0