Merge commit '4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp * commit '4174016dbd043eda493e9cd1925ed84549c7b3c0': move SubscribedFeeds to GSF
Merge commit '4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp * commit '4174016dbd043eda493e9cd1925ed84549c7b3c0': move SubscribedFeeds to GSF