Merge "Add newly available version information to dumpsys"