Original change I122e1218dd0072c979a59bdafd3e0b6f4eec99ab was missing search provider logic adjustments and length limits on the added strings. Bug: 15313133 Change-Id: I8910dd60111c87f5494db7bac76a351e89c1a99b