Merge redfin/bramble support.

Bug: 171218636
Merged-In: I010c019b17b80d4f3a65aceedfd530ddbfbd2952
Change-Id: I4b266307e17505a93261c9be5aa1aa0eab53159d