Merge "Unbreak gen command and sync with current tree" am: 72cb9bff92

Change-Id: I3db14f8f020fd7ee7f8bbad890a3e100a87102ad