Fixes #105.

Change-Id: I86ea45ddb1db0dd9f74f193974cfd5322121d9be
Reviewed-on: https://code-review.googlesource.com/6730


Reviewed-by: Paul Wankadia <junyer@google.com>