Merge redfin/bramble support.

Bug: 171218636
Merged-In: Ifab9c18c3b6adb2e874f3cd560646b734041c055
Change-Id: I394db33a504bb2f2a0a1a2902780d47b473bbb3a