Merge QP1A.181119.002

Change-Id: I12a08ebc0a9d3e39c80b1720a1f394b2d86205be