Merge QP1A.190228.005

Change-Id: I3f3812af3a4852961e8bdc23c7c559f0336e2d42