Merge QP1A.190122.001

Change-Id: I37ebfd9c370bdb9a50a1b390500dd5eebffcf231