Merge redfin/bramble support.

Bug: 171218636
Merged-In: I734867f031046ef38a22dd04ec3efdd46663db41
Change-Id: Id1cc88b754709980cf9b127d62180daa4e8ef45f