Merge QP1A.190228.005

Change-Id: I1a203a9db5411163bee153748045c20cb63c96b4