Merge QP1A.190107.001

Change-Id: I903d9dfadee3e0e048dab18e8ff9cd5758535e69