Merge QP1A.190501.001

Change-Id: Iebde2ae2076c3421057ff0dac45d95a54a9eeb7c