Merge QP1A.190228.005

Change-Id: Id4b400f3a8c17de24237ee51cf71e5ed280fc883