Merge QP1A.190107.001

Change-Id: Ic2cd226c1e5abcde93cd5fa9fa293bf123cc6f9a