--- a/mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/LocalBrowserDBTest.java
+++ b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/LocalBrowserDBTest.java
@@ -109,28 +109,28 @@ public class LocalBrowserDBTest {
         final BrowserDB db = new LocalBrowserDB("default");
         final ContentResolver cr = context.getContentResolver();
 
         final long rootId = getBookmarkIdFromGuid(BrowserContract.Bookmarks.MOBILE_FOLDER_GUID);
         // Create a parent folder
         final Uri parentUri = db.addBookmarkFolder(cr, FOLDER_NAME, rootId);
         assertNotNull(parentUri);
         // Get id from Uri
-        final long parentId = Long.valueOf(parentUri.getLastPathSegment());
+        final long parentId = Long.parseLong(parentUri.getLastPathSegment());
 
         // Create nested child bookmarks and folders
         // parent / bookmark-1
         //        / folder-1
         //        / folder-2 / bookmark-2
         insertBookmark("bookmark-1", null, "guid-bookmark-1", parentId, BrowserContract.Bookmarks.TYPE_BOOKMARK);
         insertBookmark("folder-1", null, "guid-folder-1", parentId, BrowserContract.Bookmarks.TYPE_FOLDER);
 
         final Uri folderUri = insertBookmark("folder-2", null, "guid-folder-2", parentId, BrowserContract.Bookmarks.TYPE_FOLDER);
         assertNotNull(folderUri);
-        final long folderId = Long.valueOf(folderUri.getLastPathSegment());
+        final long folderId = Long.parseLong(folderUri.getLastPathSegment());
         insertBookmark("bookmark-2", null, "guid-bookmark-2", folderId, BrowserContract.Bookmarks.TYPE_BOOKMARK);
 
         final String selection = BrowserContract.Bookmarks.PARENT + " = ? OR " +
                                  BrowserContract.Bookmarks.PARENT + " = ?";
         final String[] selectionArgs = { String.valueOf(parentId), String.valueOf(folderId) };
         final int childCountBeforeRemove = getRowCount(selection, selectionArgs);
         assertEquals(4, childCountBeforeRemove);
 
@@ -147,17 +147,17 @@ public class LocalBrowserDBTest {
         final BrowserDB db = new LocalBrowserDB("default");
         final ContentResolver cr = context.getContentResolver();
 
         final long rootId = getBookmarkIdFromGuid(BrowserContract.Bookmarks.MOBILE_FOLDER_GUID);
         // Create a parent folder
         final Uri parentUri = db.addBookmarkFolder(cr, FOLDER_NAME, rootId);
         assertNotNull(parentUri);
         // Get id from Uri
-        final long parentId = Long.valueOf(parentUri.getLastPathSegment());
+        final long parentId = Long.parseLong(parentUri.getLastPathSegment());
 
         // Create more than DBUtils.SQLITE_MAX_VARIABLE_NUMBER child bookmarks/folders.
         for (int i = 0; i < DBUtils.SQLITE_MAX_VARIABLE_NUMBER; ++i) {
             insertBookmark("bookmark-" + i,
                            "https://www.mozilla-" + i + ".org",
                            "guid-bookmark-" + i,
                            parentId,
                            BrowserContract.Bookmarks.TYPE_BOOKMARK);
@@ -302,17 +302,17 @@ public class LocalBrowserDBTest {
         } finally {
             cursor.close();
         }
         assertNotEquals(bookmarkId, INVALID_ID);
 
         // Create a folder
         final Uri newFolderUri = db.addBookmarkFolder(cr, FOLDER_NAME, originalParentId);
         // Get id from Uri
-        final long newParentId = Long.valueOf(newFolderUri.getLastPathSegment());
+        final long newParentId = Long.parseLong(newFolderUri.getLastPathSegment());
 
         final long originalParentLastModifiedBeforeUpdate = getModifiedDate(originalParentId);
         final long newParentLastModifiedBeforeUpdate = getModifiedDate(newParentId);
 
         // Update bookmark record
         db.updateBookmark(cr, bookmarkId, UPDATE_URL, UPDATE_TITLE, "", newParentId, originalParentId);
         cursor = db.getBookmarkById(cr, bookmarkId);
         assertNotNull(cursor);
@@ -344,17 +344,17 @@ public class LocalBrowserDBTest {
         BrowserDB db = new LocalBrowserDB("default");
         ContentResolver cr = context.getContentResolver();
 
         // Add a bookmark folder record
         final long rootFolderId = getBookmarkIdFromGuid(BrowserContract.Bookmarks.MOBILE_FOLDER_GUID);
         final long lastModifiedBeforeAdd = getModifiedDate(rootFolderId);
         final Uri folderUri = db.addBookmarkFolder(cr, FOLDER_NAME, rootFolderId);
         // Get id from Uri
-        long folderId = Long.valueOf(folderUri.getLastPathSegment());
+        long folderId = Long.parseLong(folderUri.getLastPathSegment());
 
         final Cursor cursor = db.getBookmarkById(cr, folderId);
         assertNotNull(cursor);
         try {
             assertTrue(cursor.moveToFirst());
 
             final String name = cursor.getString(cursor.getColumnIndexOrThrow(BrowserContract.Bookmarks.TITLE));
             assertEquals(name, FOLDER_NAME);
@@ -580,17 +580,17 @@ public class LocalBrowserDBTest {
     }
 
     private void testDeleteBookmarkWithSize(BrowserDB db, ContentResolver cr, String guidPrefix, int size) throws RemoteException {
         final long rootId = getBookmarkIdFromGuid(BrowserContract.Bookmarks.MOBILE_FOLDER_GUID);
         // Create a parent folder
         final Uri parentUri = db.addBookmarkFolder(cr, FOLDER_NAME, rootId);
         assertNotNull(parentUri);
         // Get id from Uri
-        final long parentId = Long.valueOf(parentUri.getLastPathSegment());
+        final long parentId = Long.parseLong(parentUri.getLastPathSegment());
 
         // Create more than DBUtils.SQLITE_MAX_VARIABLE_NUMBER child bookmarks/folders.
         for (int i = 0; i < size; ++i) {
             insertBookmark("bookmark-" + i,
                            "https://www.mozilla-" + i + ".org",
                            guidPrefix + i,
                            parentId,
                            BrowserContract.Bookmarks.TYPE_BOOKMARK);