Merge "Suppress expansion-to-defined warning"
am: cd64d115bd

Change-Id: Id965caeb56b28f2d92a6551df99d80b9bb1b2a80