Remove global state from EntityDataRequestHandler

Change-Id: Id902acdf384a7ef17da4ce68ecb06ba581f7ab24
Merge "Remove global state from EntityDataRequestHandler"