am ca895fbc: am 91c12e3c: Merge "file class macro cleanup"

* commit 'ca895fbc0b6bf4070c2c275945cbdfae22150590':
  file class macro cleanup