Merge QP1A.190627.001

Change-Id: I203c1936d0bae0022333606d1df8b1aee7038b7f