Merge change I43a335c3 into eclair

* changes:
  Suppress takePicture test from continuous DO NOT MERGE.