commit c99991f207728dbd3f07724602eed2d935101aea Author: Skye Wanderman-Milne Date: Wed Apr 30 10:49:30 2014 -0700 Codegen improvements Change-Id: I3d2d2e7e9f970dda8ccb4e729fdbfbdeb1dd9a06