Merge "fix runtime issues for scripts"
authorChristopher Ferris <cferris@google.com>
Thu, 11 Dec 2014 18:31:59 +0000 (18:31 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 11 Dec 2014 18:32:00 +0000 (18:32 +0000)

Trivial merge