Change-Id: Id1e74f18c90e69d1a781c8f02e30dc3c005ed4fd
Also fix some compile errors. I suspect this is dead code, but on the chance that it might be useful..... Change-Id: I0d56df88420ce484b72df626db4fadcebe04d777