Merge QP1A.190418.001

Change-Id: I6d4d44210bc233d45cd73272eeb7432b88062b72