Merge "TextInputLayout - a wrapper around EditText" into lmp-mr1-ub-dev