Merge QP1A.190228.005

Change-Id: Iaa517d408773398db4558900ab97a7b25a47c164