Merge redfin/bramble support.

Bug: 171218636
Merged-In: I948358ee4ea59ad27abb41fa46fffadc75bd88fa
Change-Id: Id8bb22f22ca04a989fff9adc2a13c273359e4899