Merge redfin/bramble support.

Bug: 171218636
Merged-In: Iebf4cb590f76f19e11677a2506aa3790dc338898
Change-Id: I7d345426220c25921017d07fc594705532d825b2