Supporting API level 12 (Android 3.1+) for testing purposes
Minor relocation