Applying the stable/helium release patch for groupbasedpolicy

Change-Id: I179032ea4f470eef5434d0320256235eaa17be7c
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>