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

Change-Id: I1ca4397554f2279355765cdac66b2940fd1069f7