Merge QP1A.181119.002

Change-Id: Icb1d6f735b46c7f2ea562a2d72f8767e85de5825