Merge "remove "// static" comments" am: 6170b8777e am: c41a3f64e1 am: 03c9ebb0eb
am: f010d80c62

Change-Id: I12f15b9ca24fd10544cbca36043a087221bb3cfa