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

Change-Id: I716c13e414c17f5db172503e062b53669e3664ae