Merge QP1A.181119.002

Change-Id: Icf2e8cf581b2d9a0644d7b1ba31fedac3a5cbccf