Merge QP1A.190324.001

Change-Id: I25ad44c751911b28e20b3461cf061f1500cd4e83