Merge QP1A.190107.001

Change-Id: Id2ba7f157d26c7f21050347dd71c199a13f2efec