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

* commit 'd4a6fc5bc205d516e5bf05cafc5b6eadb4e0b372':
  Init: Fix Clang unsupported attributes