Merge redfin/bramble support.

Bug: 171218636
Merged-In: I2a7aa5f17b334545f79a4552be9f8df2f91f7b82
Change-Id: Idb4bb01bdeef0d2443ba43311f240dcb8f70f2f5