The static declaration must come after the visibility declaration

Change-Id: I50b7f39d527f5590373192a684ec07949988ec23
Merge "The static declaration must come after the visibility declaration"