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

Change-Id: Ic009d85dd87218665d9ca52a9d687b946e4824d8