Merge "Removed __unused variable macro usage from ESQueue.cpp" am: 225b230cbc

Change-Id: I05a4581a146c6c23bd129ad512ab28dcf641b7fd