Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb