tree af074efd6cc49f0a00d3469635ddca938f4f43fa
parent 0363d05336c5e9c954f026e32d4c0cbca3fe872d
author Charles Chan <rascov@gmail.com> 1520278103 -0800
committer Charles Chan <rascov@gmail.com> 1520278103 -0800

Address comments in gerrit 17355

Change-Id: I3c5c2a77ca8e427d14607fccc89b8fb1a1cd38bd