Merge redfin/bramble support.

Bug: 171218636
Merged-In: I9e19972d433064adc527b014822449996dd09752
Change-Id: If54203d20c305271ce1eccce91d0ef4f7cae8f39