Merge redfin/bramble support.

Bug: 171218636
Merged-In: I93903c258f834a9e9537b88882d77a6660482638
Change-Id: I189617bec65de28e012bcda724ea06b5c350e481