remove "// static" comments am: e606433c10 am: d7e3d23dea
am: d283b46a3a

Change-Id: Id70deacc6098f062ebb94f00bebf5f455d60837d