Merge "Improvements to TextInputLayout" into lmp-mr1-ub-dev