Merge redfin/bramble support.

Bug: 171218636
Merged-In: I22b952d0944fc1d1be7f6222add1a0b6108682d7
Change-Id: Ia75c4ae9f5c062ab78f18fee5a448b66daf34882