Merge QP1A.190122.001

Change-Id: I007ce8bd34b0e1acab7564aff4b55a2ade1370d5