Merge redfin/bramble support.

Bug: 171218636
Merged-In: Id477589245376a178f7b7fe8bb5a40b0b6a2421a
Change-Id: I1dbf3072fca78afa2da0b64dc537b116f2537b84