Update entities version dependency, conditionally use workaround.

Once everyone is using the new entities version, we'll punt the
workaround entirely.

Change-Id: I84a485296973c7e69084554564ac47ae0ebc9447
Merge "Update entities version dependency, conditionally use workaround."