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

Change-Id: I5ed7f660e704324006023d23a173d1e673174411