Merge QP1A.190205.002

Change-Id: I359819c35653923b189eff4c122c0e324e1cb4b6