Merge QP1A.190205.002

Change-Id: I45fd11b68919ad20c522bb6feae4ae025a9082bb