Merge QP1A.190306.002

Change-Id: I9d94f6d6125e6593c99ec2537a77ed67fe36c210