fix class scoping

Change-Id: Ie0cef903ed5e034138b446387f910872d06b0eb7
Merge "fix class scoping" into production