Merge QP1A.190324.001

Change-Id: Id51eb6528df98733b919a82224e34f5a619fed31