Merge redfin/bramble support.

Bug: 171218636
Merged-In: I2c4d217b0c09808c8ee1718a33325b81701383a0
Change-Id: I3495ae1a60914b3d578b94c57f04969ad0970dd5