Hopefully last fix to bullet proof the policy retrieving

Change-Id: Ia06f16f2488a9e5d241bac04413608f508a40225