Merge QP1A.190324.001

Change-Id: I94be24192d10b74e5b1d4f08520ffd954ae2e89b