Fix variable overwrite

Bug: 51207

Change-Id: Ib15759b0733ea7230b3dc0f3555e88272ac83201