am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb

* commit '3b728ca70a4fe6760b682589505d76848c47d765':
  Revert "Fixes Issue ID: 3396697"