Merge QP1A.190228.005

Change-Id: I1c69c7cb2535e56716204f17774b4bbba41bbf61