Merge QP1A.190609.001

Change-Id: I3f710062089034d82ca5d66d9cba826b2cfbd73b