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

Change-Id: I09c3fff2b8331fff4956e9dc16ce9e77543457e7