Merge QP1A.190205.002

Change-Id: Idc1f40a934cd3ad517669303ed6b422459f1d95f