Merge "[Manual] Fix static variable names"
am: 9be7c667e5

Change-Id: Ifc99b8367a31405bc24f172e9b93cc8cfdd715ba