Merge redfin/bramble support.

Bug: 171218636
Merged-In: I257641c80e6de522eca1a87b3858e330d379c638
Change-Id: I709b2d3c003d44d8aa55245e51d3730f37fb6a10