Merge QP1A.190122.001

Change-Id: Icce8bc459d05d2b832db5d47581c8dbf50bd5748