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

Change-Id: Ie80c4eb366f50ac595312b72756f876d14329542