Fix follow up review issues with endpoint policy backend patch.

Change-Id: If5d741ae9efdbbbc84df15d30b83d1024c2b6f21
Closes-bug: 1363750
Merge "Fix follow up review issues with endpoint policy backend patch."