Scope reduction.

Change-Id: Ie92743a05c857f0cbb5e812d8341127d29d18202