Merge QP1A.190219.001

Change-Id: I2ea80823de50e4bd89f5b441f67de0c2d7f45cff