Merge QP1A.190324.001

Change-Id: I2dcd0f60b465ad8b7c63e52a178d6872639f9ae5