Merge QP1A.190502.003

Change-Id: Ie9e15dc79db83701e2cec8dec7dd3e2c735ab543