Merge QP1A.190228.005

Change-Id: I8d00da1e736b341fd585491357220bce3903c877