Merge redfin/bramble support.

Bug: 171218636
Merged-In: Ie05fa703825c725c5f8de592eb6c6d20ebd41736
Change-Id: Ic7527745024dd57d67c8f14d680b02df57000ba8