Add patch to fix Entity API regression.

Change-Id: I234c729cc2729e6d0e5e8d2f0849ae03b25e5df7