Fix problem with generated file names

Change-Id: I56698cd677be62e48b4e010e8dc0630233cf0e83
(cherry picked from commit ff5abc6892aedb25215689bd679eb7cc1588a8e3)
1 file changed