Merge QP1A.190404.001

Change-Id: I2c853c3da0755cc74badae5b1904e4be1576a7fc