am ca560df9: Merge "Some fixes for TextInputLayout" into mnc-dev

* commit 'ca560df98c008072b70f75c473fdabad7e7a6f43':
  Some fixes for TextInputLayout