Merge QP1A.190228.005

Change-Id: I9897d2c73611025c601c6a014f5a4222e20060f3