Merge QP1A.190228.005

Change-Id: I519bf9e0a1d94c1704d42b803199a59ad8987e4a