Reduce scope level.

Change-Id: Icfa4a81ebab1df943a71869fb8fc6409a8927464
(cherry picked from commit bdbe60051878bda9e9df11cfef032788c8347ba6)