Revert "Fix variable"

This reverts commit ceefaadae1dc4c6412d5601090583619b5706d66.

Change-Id: I655b7ec791b443ed805cbe973be19db080824317
Merge "Revert "Fix variable""