diff --git a/tools/build/bazel/javadoc.bzl b/tools/build/bazel/javadoc.bzl
index 7a06a14..e073426 100644
--- a/tools/build/bazel/javadoc.bzl
+++ b/tools/build/bazel/javadoc.bzl
@@ -28,7 +28,7 @@
 
   cmd = [
       "mkdir %s" % dir,
-      "javadoc -encoding utf8 -quiet -tag onos.rsModel:a:\"onos model\" %s -d %s -cp %s %s" \
+      "javadoc -encoding UTF-8 -quiet -tag onos.rsModel:a:\"onos model\" %s -d %s -cp %s %s" \
           % (JAVA_DOCS, dir, ":".join(dep_list), " ".join(src_list)),
       "jar cf %s -C %s ." % (jar.path, dir),
   ]
diff --git a/tools/build/bazel/project_javadoc.bzl b/tools/build/bazel/project_javadoc.bzl
index 7a09a93..86b61d5 100644
--- a/tools/build/bazel/project_javadoc.bzl
+++ b/tools/build/bazel/project_javadoc.bzl
@@ -54,7 +54,7 @@
         cmd += ["find src -type f | egrep -v 'src/(OSGI|WEB)-INF' | egrep -v '/(impl|internal)/' >> FILES"]
 
     cmd += [
-        "javadoc -overview overview.html -doctitle '%s' -windowtitle '%s' %s -d apidocs -classpath %s -sourcepath src %s @FILES" \
+        "javadoc -encoding UTF-8 -overview overview.html -doctitle '%s' -windowtitle '%s' %s -d apidocs -classpath %s -sourcepath src %s @FILES" \
               % (ctx.attr.title, ctx.attr.title, group_list, classpath.replace(":", "", 1), JAVA_DOCS),
         "cp -r doc-files apidocs/doc-files",
         "jar cf %s apidocs" % jar.path,
diff --git a/tools/dev/bin/cell-build b/tools/dev/bin/cell-build
index 8169ab0..fc88ee4 100755
--- a/tools/dev/bin/cell-build
+++ b/tools/dev/bin/cell-build
@@ -8,13 +8,15 @@
 
 runTests=false
 useCache=false
+noBuild=false
 
-while getopts b:ct?h o; do
+while getopts b:cnt?h o; do
     case "$o" in
         b) branch=$OPTARG;;
         c) useCache=true;;
+        n) noBuild=true;;
         t) runTests=true;;
-        *) echo "usage: cell-build [-b branch] [-ct] [commitHash]" >&2; exit 1;;
+        *) echo "usage: cell-build [-b branch] [-cnt] [commitHash]" >&2; exit 1;;
     esac
 done
 
@@ -57,7 +59,6 @@
 
     # Run the build (neutralizing known environment mutations in SSH sessions)
     set -e
-    SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 bazel build onos
-    [ $runTests = true ] && \
-        bazel query 'tests(//...)' | SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 xargs bazel test
+    [ $noBuild = false ] && SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 bazel build onos
+    [ $runTests = true ] && bazel query 'tests(//...)' | SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 xargs bazel test
 "