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

Change-Id: Ib128afb5e7cfa86d65c805174e02e8a96eeac186