Merge QP1A.181119.002

Change-Id: I99fce03f5db49b3441dd7189e6b21eaa47d75ee5