Merge QP1A.190219.001

Change-Id: Ibab53b0fb58248f1667cc5a568dd61bba43de93e