Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev