Merge QP1A.190228.005

Change-Id: I7d2fbb85e3f2e60771b63218737fd3c8b2a4007a