am daa107c8: am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo

Merge commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e' into kraken

* commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e':
  Fix inconsistency in how we handle light sensor when battery is low.