Merge QP1A.190122.001

Change-Id: Icdad45c95b0a140e57cf60cc7c423e0c011a1451