Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev