Merge QP1A.181119.002

Change-Id: I6fdb5771de237a10fef7e69dbd5504c18733c28b