Merge QP1A.190530.001

Change-Id: I85f7a4b4889da69b0e740e1241cb78f69d437672