BUILD 1417653616: Rebuild with buildmanager from updating_build branch