Merge "Fix handleGettingEabContactCommand return null"