Merge redfin/bramble support.

Bug: 171218636
Merged-In: I1113182bd74d53fb8b43e567bc8dd44d866ce74c
Change-Id: I5d44544c5254df26be35a429eb78d7b986cab48c