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

Change-Id: I5267214c1b022d3d7ec4bb6b046262396d40b46c