Merge "Flesh out multi-user in am commands." into jb-mr1-dev