Merge QP1A.181119.002

Change-Id: Iae35dd320b551d2198ab1f6bbbd546577054785a