Merge QP1A.190228.005

Change-Id: I657d1816b3c8ca40a859c487556db336b0b7eb4c