tree f95679189f15bf47d3640e8e01d5998b7a558331
parent 30d1526548cf9cc6d1b2aa82cbe939b1424e0d71
author Asim Shankar <ashankar@google.com> 1446086284 -0700
committer Asim Shankar <ashankar@google.com> 1446086284 -0700

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

MultiPart: 5/5
Change-Id: I64502b1199ca677e28ab577258c2cc65d5d308eb