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

Change-Id: I96c48f75ae5a23109b184162d8eb344bf33f9b93