Merge redfin/bramble support.

Bug: 171218636
Merged-In: I008e798c6abbb5d93334aaf8c0c6f4495d127ea3
Change-Id: I2967ac6fe4e1164996edd8dd449b65f954ec78c7