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

* commit '5a8d428ab66e26c369151708e5895b6c952fb636':
  Fixing bug: 3241173