Merge QP1A.190205.002

Change-Id: I84e5c133130e4d5cbcdef0ebba50c7a220bef366