Merge QP1A.190228.005

Change-Id: I88bb59d69c80f570f67cffffaee2c791748e6f2f