Merge QP1A.190205.002

Change-Id: If3ea54980a388c4b67fbe2fae63d93af3090b608