Merge QP1A.190228.005

Change-Id: I417c719416a84179308957f4570a94971435c2a4