Merge QP1A.190228.005

Change-Id: I706f1d4d2f41e4362798112fb168ad9c537906e9