Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1