Fixing bug 16931.

BUG=
R=danrubel@google.com

Review URL: https://codereview.appspot.com/95500045