Merge "Fix TextInputLayout hint not working in extract mode" into nyc-mr1-dev am: b8d98f1a52 am: 026c913077
am: 75ff04816e

Change-Id: Iebadbbe1ea2b4e703f609a0c257200cb6ac0db1d