Merge QP1A.190620.001

Change-Id: I06971974bb4cd37eb3019a161f3316f2fa32bcd1