Merge redfin/bramble support.

Bug: 171218636
Merged-In: Ibd947ab8cc47013bf7fb74fcd998501784b78de9
Change-Id: I1dff36a4f43f862e1f7f6ba7c8ed3663c874d3c7