Update FeaturedFeeds to master

Change-Id: I86677d6e2a7e446565cf4acf9a3e3e42d3836440