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

Change-Id: Ib324e164beb0c2c9e1656ccc7b50005c902a8f7f