Merge QP1A.190205.002

Change-Id: Ie25255e3e7e03e82c3b376a1adacc0b19b8b28e6