Merge redfin/bramble support.

Bug: 171218636
Merged-In: I674d1774ce50ac71a37fcc0eb418d310fe01a289
Change-Id: I2b92b0481bcb8ba867437009e31e7d1a0d509c51