tree 3c6f8989e0c6e027382a3c08d221ba97afd72291
parent 1cf85515600d298a2c9e4de137c0926949205097
author Mathieu Chartier <mathieuc@google.com> 1438726781 -0700
committer Mathieu Chartier <mathieuc@google.com> 1438739814 -0700

Address some comments and clean up

Change-Id: I538cf204f1c89d5fc81f8fc5e5800fcf1cf87359