am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."

* commit '7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9':
  Eliminating dead logic - bitmap state simply cannot be null here.