Merge QP1A.190228.005

Change-Id: I59354d9a8e071c40435defb5f81bc14fee6a5322