diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index a949c11742..4834834bcc 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -2788,6 +2788,7 @@ def ParseOptions(argv,
             break
         elif handler(o, a):
           success = True
+          break
       if not success:
         raise ValueError("unknown option \"%s\"" % (o,))