Merge QP1A.181119.002

Change-Id: I4bd24bbe3d2c058325b83edcdac9148762b2a0bf