Merge changes I5af6fb62,I977c02a7

* changes:
  Use initializer macro to initialize uevent
  Add override specifier to overriding functions