Initial import of Ryan Schmidt's code

Change-Id: I1048d77a103fc12b59238d819c6e4ee24c80084c