Merge QP1A.190627.001

Change-Id: I9f11a6201c685cab44ec59344b01543c620fc8b5