Merge QP1A.190122.001

Change-Id: Ia673e50f48f8df23e51b5491669d29164d521f7c