Merge QP1A.190107.001

Change-Id: Ie8af71344900b0bb9c67ec339043a00a0eab6611