Merge QP1A.190523.001

Change-Id: Iad00671205a5715c1d41d48cc95c8753958f39c0