Merge "Support profile policy rule as a resolvable error."
am: 997a88853b

Change-Id: I3de60be5f94e60399e7a7339014d9dc79c258293