Merge QP1A.190107.001

Change-Id: I91002c713a3a7a0d95ee98baacaa0c87669d9fea