Bug 58053 - fix print & octal in generate_user_files

Change-Id: I31c262cb10f0cd98a53a5700e3c5a66f7fa13878
Merge "Bug 58053 - fix print & octal in generate_user_files"