Reduce scope level.

Change-Id: Icfa4a81ebab1df943a71869fb8fc6409a8927464