am d60e42ac: Merge "Major update to HoneycombGallery" into honeycomb

* commit 'd60e42ac038eeee9410ba0da2e55520a1635d31f':
  Major update to HoneycombGallery