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