Merge QP1A.190122.001

Change-Id: I33548a294402292279c15fe5b180b896d5939c4e