Merge QP1A.190219.001

Change-Id: I0cc7972f757b11051cb5973b72b77e67ab114bc0