Merge QP1A.190107.001

Change-Id: I316472adbb38442d33d3568772022acb8adbbe58