Merge QP1A.190205.002

Change-Id: I66c2f5a84573dd6099f1766d7819b3afc17b4f8b