am 1a326022: am 208bb08a: Merge "Fix issue 3098880." into gingerbread

Merge commit '1a32602212bad146990418094b0ffcab05c5eb7b'

* commit '1a32602212bad146990418094b0ffcab05c5eb7b':
  Fix issue 3098880.