Merge redfin/bramble support.

Bug: 171218636
Merged-In: I075961a717a9a604877dfbece5251a45a2ca8481
Change-Id: I13cc27db70267323914d0401212089f0ad4cfcda