Merge QP1A.190122.001

Change-Id: I2fe9c79d428950a3a7b7149001e107f95d850c15