Merge redfin/bramble support.

Bug: 171218636
Merged-In: Id98937603168f422d71acc1006f66b8570a0e0c1
Change-Id: Ia000e8a8e4b620dfe55ac95707b80b76d9ce3916