Merge QP1A.190205.002

Change-Id: I2f69e1dec2e40af948ed52064e78086abdab3bf4