Merge QP1A.190228.005

Change-Id: I2de27136335aadda0a8220d1c7cd3fba77c37e26