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

Change-Id: I34762218838865b47eeb689300785d6539ef8f76