fixed policy - use time of creation instead of name. Latter doesn't work during startup

Change-Id: Idef56e75e1c199e39fc8c02fd48794484c48f230
Merge "fixed policy - use time of creation instead of name. Latter doesn't work during startup"