Merge QP1A.181119.002

Change-Id: I7effaf816d940f2a03619f726c12897c2c765792