Merge QP1A.190228.005

Change-Id: I793430dad6f78d46d51658f3c2ea68fd629d03f4