Merge QP1A.190228.005

Change-Id: I66bb8a53cd43da9243cfeaa92b886f403694e3fc