Merge QP1A.190107.001

Change-Id: I5acadec371094c70f188a95da5abac6f80187316