Merge redfin/bramble support.

Bug: 171218636
Merged-In: I921547b6666d3287330847cecc60fa08f09e4306
Change-Id: I6381709e708dd007a5198f2c1832319042596775