Merge QP1A.190122.001

Change-Id: I9ac58652458f83b9da3a483cf575d05dfdbb52fe