Merge QP1A.190324.001

Change-Id: I66b6d7dc04852799e14240a79f97774935e6b5a8