Merge QP1A.190107.001

Change-Id: I3058a6fc92da8aa32931edbe6d40a875717bebc9