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

Change-Id: I7ff845dd77c5150822f14f707e4529dbafe066e0