Merge QP1A.190122.001

Change-Id: I0172e0ffd3cdbc9e8778c784bd5d87add361406c