am 30a6db9c: am 36449a1e: Merge change Ic2680af0 into eclair

Merge commit '30a6db9cf31c95a6329170dfd5de2e27cfe47b16' into eclair-mr2-plus-aosp

* commit '30a6db9cf31c95a6329170dfd5de2e27cfe47b16':
  Cleanup for coverage.