Merge redfin/bramble support.

Bug: 171218636
Merged-In: Ib1f492fa3bca03fdc718a62372cf43da92647b7f
Change-Id: I9acc2cd0da0ee77644e2342833684d6897efbccb