Merge redfin/bramble support.

Bug: 171218636
Merged-In: Id4f5f987398148e223bc20289e8adfbd5054b409
Change-Id: I1d843a38c53f58608c751b72acfa7007508d184f