Merge QP1A.190418.001

Change-Id: If36ad40cb0e0b7dc4e59263f380712f9c29b5f3e