Merge QP1A.190404.001

Change-Id: Ia6ee85f26a50de7e4b4ad804b66bec63260642c6