Merge QP1A.190107.001

Change-Id: Ic1988a13faa92d6af3b9a2afbc9d179de375a0b4