Merge redfin/bramble support.

Bug: 171218636
Merged-In: I017454842ac404c4d2565a613fb9b4dfcdeb7eb2
Change-Id: I58b901e3e4438f05940052458464aeaf35f3dc85