Merge redfin/bramble support.

Bug: 171218636
Merged-In: Idbb48a452d1da60129cf7f74233eac149079bc83
Change-Id: I2f210a3d4e66c38cdbbf0a08f18e4bed9a44163b