Merge "Replace executeAdbCommand with executeShellCommand" into main