am eb344aa3: Merge "TextInputLayout fixes" into lmp-mr1-ub-dev

* commit 'eb344aa3dce8765684467c94b6b5b98831ab15fb':
  TextInputLayout fixes