Merge "Fixing bug: 3241173" into honeycomb