Added several lines I found during import from Eclipse ADT.