Merge QP1A.190212.003

Change-Id: If90c3aff99b030ac7601465e45f6400637eada8a