Autogroup patch group by current user android UID
merge from master
Merged from master