Merge "Stop defining local "unused" macros now this is C++." am: 3183c567b0
am: b32552496c

Change-Id: Ifd331ff99d7eee80bbba392ccdd522d7af6c6516