Do not pass whole Entity when not needed

Change-Id: I5f3b993ec7bd4839028519f66e583e286c50510a
Update type hints to not use Entity

Change-Id: Id4b202f1fc86e383d0c4240cd1649240b7de118b
Merge "Update type hints to not use Entity"
Merge "Do not pass whole Entity when not needed"