Merge QP1A.181119.002

Change-Id: Ia745aa0c3b9988cf88d859ee56848e554ea8e8bb