Merge QP1A.190404.001

Change-Id: If3a800c2370bed81692bfbeb68fbcc67ce0dfc6c