Merge redfin/bramble support.

Bug: 171218636
Merged-In: If81d2c30f480068a55c5fc12f47a1cfb54086302
Change-Id: Ia7db07375ec6880f40babc2d315ac87a050bf240