Merge QP1A.190228.005

Change-Id: I5d32819ff7ecb234d5de136deaada507d90ffce6