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