Merge QP1A.190501.001

Change-Id: Ibe4695f308922a9f3c5b73d4adaad54b3b2e9b0c