Merge redfin/bramble support.

Bug: 171218636
Merged-In: I560f047d33c985b0e072a35a32bfa35ae4cd15d9
Change-Id: I671a5fcc3edd84f6f9db1ff9ae240f0dff6f8430