Update FeaturedFeeds to master

Change-Id: I04eeb703550b388ea45049bc8f41660fa155bf9d