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

Merge commit '9552c4f441dfb322d815c3848161ea6451ac7661'

* commit '9552c4f441dfb322d815c3848161ea6451ac7661':
  Cleanup for coverage.