Merge "remove "// static" comments"
am: 6170b8777e

Change-Id: Ic89a6e77c1a8797c06d46ee1cab70604159f11f3