Merge "Frameworks/base: Fix two warnings in cmds"