Change in this commit is suggesed by Tim Terriberry.

BUG=aomedia:413

Change-Id: I4f79fd30d65d984ea4a1fe069bb715937856721f