Merge "Switch am command to go through "cmd activity"."