tree 224e2bfe6ab23358854787c64a0bd33925f565d4
parent bd3ccf89518c1659cc6560830453f6f0cff66e32
author Asim Shankar <ashankar@google.com> 1444877686 -0700
committer Asim Shankar <ashankar@google.com> 1444877686 -0700

Counterpart of https://vanadium-review.googlesource.com/16644

MultiPart: 2/7
Change-Id: Ie694c3bb9960974997b7370f5c423256ebdea082