The static declaration must come after the visibility declartion

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