Merge "Fix overriding commands warnings/error"
am: cc69e238b5

Change-Id: I11da363293a352fe3a94e6c49691c83bfd950f6e