Merge QP1A.190404.001

Change-Id: I8771ce01369c4a9b3ee2d0d483b3f814947ef0b4