Merge "Removing old pocket assets" into honeycomb