Merge QP1A.190107.001

Change-Id: I513ac3249e377786fcc10d2ad266ba7c46ce4fd5