Merge "Removed unused variable macro usage" am: 1d7a55510d

Change-Id: I2b6f308be50c5fbd9b2ddaeb1c6053c57dd89c1d