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

Change-Id: I559f697039a7f411eee14ac119912d390493328c