Merge QP1A.190501.001

Change-Id: I4983e66431b73393d7dce05a4f520a657dabfc53