Merge QP1A.190205.002

Change-Id: If5b9ee9e2bc45ae6193a75f1419ba9e42b9371c6