Merge QP1A.190122.001

Change-Id: I2dc9d630a3fdf39366e6b87c844585206174a965