Merge "Fix misc-macro-parentheses warnings in init and other core modules."
am: ac080d2128

* commit 'ac080d21280f0448f554315c76993e788c764e8f':
  Fix misc-macro-parentheses warnings in init and other core modules.

Change-Id: I48c8de08f334d9b2ae45679c53a4d523bc1358fd