tree 49eed38e4399c4a0a977b39858fabcdab56e4000
parent 5a693fd1222205df0888b043ac9106d30308c085
author Asim Shankar <ashankar@google.com> 1444438665 -0700
committer Asim Shankar <ashankar@google.com> 1444438665 -0700

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

MultiPart: 5/6

Change-Id: Id3fb3e52203bf271a19e9cd14ac6d5f509cf0dd5