Merge QP1A.190122.001

Change-Id: I2db6714e69a4c9598c68448928b86ee03fa10190