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

Change-Id: I00116bfdb71ae08c4a2f148644af3ce01b10078e