Merge redfin/bramble support.

Bug: 171218636
Merged-In: Ib4f79f13505061c294b0f9b120765d866aad38cc
Change-Id: I13240f1a052fe887219e5ecf30e86a2a6b294528