Adding missing methods added in 1.1
Fixing a test that regressed from multipart merge
Removing Calls to depracated APIs
Merge branch 'Android1_1fixup'