Auto-gen code fixes for nfc

Change-Id: I441b9c5760e3578cf35dcde81d6f58ee2109940c
12 files changed