Merge QP1A.190122.001

Change-Id: I683e27071cf16dba4a877bb8f003a32b90657879