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

Change-Id: I11803ceda91939fa11733c0b68a20ef2bd071c32