Merge QP1A.181119.002

Change-Id: I017cfc086cc8d511b5d6e29636dc4b02d5535ae4