Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void"."