Merge QP1A.190122.001

Change-Id: I1f6690a90973a5e05bd139a01b32c2845f075d0b