am a9a4a727: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/cts into ics-scoop-plus-aosp

* commit 'a9a4a7272d2e5b1961b2a0e930008f9d5233959b':