Merge QP1A.181119.002

Change-Id: I2e7b12ed3d438a752762a19b945f6c394a62555b