am e0b23da8: Merge "Tweak sanity check." into gingerbread

Merge commit 'e0b23da8dfde8ed232bb03887762e580e0c4e04c' into gingerbread-plus-aosp

* commit 'e0b23da8dfde8ed232bb03887762e580e0c4e04c':
  Tweak sanity check.