Add sample bundles and a basic sanity-test test suite.

Change-Id: Ic6af13eda2a418eab6456feb4b6ae9f76a559150
Fix the hacky work around for collections.

Change-Id: Ib90520da0cac319d9a403f8c071fdaa5168e1125
Merge "Fix the hacky work around for collections."