Merge QP1A.190418.001

Change-Id: I2725d785c1524df5008f4e0db69a062239c3bc80