Merge "Detect `am get-current-user` failures"