Merge QP1A.190122.001

Change-Id: Ic5fb882e001b447aef13120ecef907d00061f6fd