Merge redfin/bramble support.

Bug: 171218636
Merged-In: I997f5f93b9221528d6e03d1a53e271cf40e2a060
Change-Id: I0ff933545ace32a418eb643d8383de51e66a0d54