Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release

Change-Id: I71c020e283326cc9ae8bb99fcea83e32c98c6e6d