Merge redfin/bramble support.

Bug: 171218636
Merged-In: I44d588b50aab903bb944eaaf2c84b8fe70bb2165
Change-Id: Id1b929cffdf6cbfff1890de61a919e617f0e3077