Merge QP1A.190228.005

Change-Id: Iac10878e150f5e03134c8dd4fe34110a47a41ed0