Merge QP1A.190107.001

Change-Id: I2a05cc395bef6518c8d0121d58bf73094fcac6cc