Merge QP1A.181119.002

Change-Id: I7713bf24945d7af01b9d1009e09882dbdde90eca