am 2f38651d: Merge "Fix NPE in onMessageCursorLoadFinished. b/17400031" into ub-gmail-ur14-dev

* commit '2f38651dfa7c48d3bcbdf205103e5a1f65edc238':
  Fix NPE in onMessageCursorLoadFinished. b/17400031