Merge QP1A.190122.001

Change-Id: I56d8c2459315db3b00558d6ccb4592e8631997d0