am 090b69b2: Merge "Handle the case case." into jb-dev

* commit '090b69b2def68199dfa5206fc8f03b7f7d084985':
  Handle the case case.