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

Change-Id: If5f33f454201b03aa88091c5f269078e653a303e