Data2#153 yuanzhe->Wangfeng

merge device callback from xifei