Merge "Changes on am / cmd user for ITestDevice integration"