Merge redfin/bramble support.

Bug: 171218636
Merged-In: I39678cb2ee2352f49481fadc25a6244f990401b4
Change-Id: I86b56ab296ce55701a570428887641e1db917a8a