Merge QP1A.190219.001

Change-Id: I96b5dc2c646f840211378027fb5b4499ea5102db