Merge QP1A.181119.002

Change-Id: Ib80e543fb88a75dd021d7373d5f64d987b59318d