Merge QP1A.190122.001

Change-Id: I307f03951018a3405e17856972d601e56b84a7d3