Merge QP1A.181119.002

Change-Id: I1abb62e2234f8cf86116270d67e5051a57b6d72f