am 831fb1b0: Merge "Fixing bug: 3241173" into honeycomb

* commit '831fb1b0a229f70ee53eacb23efe9155b1a09ef3':
  Fixing bug: 3241173