Merge QP1A.190228.005

Change-Id: I7d4ceac2f5ded676872c796102602d10e2599533