Merge redfin/bramble support.

Bug: 171218636
Merged-In: I71634cd2737915d4760dc6a4bc1decc1ea37023a
Change-Id: Ieeac1eb4b1dd5d743c38c2319f9cf4c773070a94