Merge QP1A.181119.002

Change-Id: I8dbde151f1a8befc0a95c2d61510def11eb850d8