Merge QP1A.190228.005

Change-Id: I7bda732438de934127f805cab3164f2696ff5fd9