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

Merge commit 'c12b0da035901923893f50663c48cb4efd390712'

* commit 'c12b0da035901923893f50663c48cb4efd390712':
  Tweak sanity check.