Merge QP1A.181119.002

Change-Id: I92febc24832b27f08901d8452d1afca10963bb5b