am 93a0bcdb: Merge "BUG: 21262226,23979591,23040468,23144425" into mnc-dev

* commit '93a0bcdb813d585c434fe0d8a78791d696ec4aba':
  BUG: 21262226,23979591,23040468,23144425