Merge redfin/bramble support. Bug: 171218636 Merged-In: I34a9e434b0b481f7dd3ad9a86e2c89bc300ceae5 Change-Id: Idaa5a6c429f7842320ea0227d468775e96abf4ab