Merge redfin/bramble support.

Bug: 171218636
Merged-In: I5a01a06d95ff7649d71636b601e389fcc646c1ea
Change-Id: I65524319d483a9c95ab10f583b5674b71faabb8f