Merge QP1A.190404.001

Change-Id: Icdc958bd84adde5ad5038c1826fdaac4e121945d