Merge redfin/bramble support.

Bug: 171218636
Merged-In: I5fe1a724a73a0c94e4dec01336ee8574b052dd9e
Change-Id: I384c1fdf97c1ca4746c74b5a2f0171a7ac5ef944