Remove old refs to Policy's endpoint_id attr

Change-Id: I9686e4080f46988c41b3872cb85d111d0daf9ecb
Merge "Remove old refs to Policy's endpoint_id attr"