Merge QP1A.190228.005

Change-Id: I1b248564f442673c2ab878eb1709587d9978be92