Merge QP1A.190324.001

Change-Id: Iabbd0d0cc416837cac623cdb8950f58b61ea3845