Merge QP1A.190212.003

Change-Id: Ieb3c37926dc51a8cefa59ec9c324a7d3c39e3dce