Merge redfin/bramble support.

Bug: 171218636
Merged-In: I4921f12ce80f14dff39c8838b5325f54e19c38f4
Change-Id: I26b704f8b98823d07be41fcb49426864160b1dcf