Fixes #318

Change-Id: Ibb89806e0e45d4848e7fce2ae5c72fc72ad2f92c
Reviewed-on: https://code-review.googlesource.com/c/36190


Reviewed-by: Chris Broadfoot <[email protected]>