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

Change-Id: Idf148a130567155138d18a57a2966aae7c71a386