am 0642403c: am d4a6fc5b: Merge "Init: Fix Clang unsupported attributes"

* commit '0642403c4fc23ad2f3ff82a26dc7c1d32e161128':
  Init: Fix Clang unsupported attributes