Merge QP1A.190228.005

Change-Id: I0a4f3fdbc3cc546d69863bd34eef5804aa835016