Merge QP1A.190228.005

Change-Id: Icd061f0b9a602fb80a23825628bfcc97821ada38