Merge QP1A.190219.001

Change-Id: Iaa7ba4d8f13caf74a3fa7b9f5cf2d751d8c96be9