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

Change-Id: Iae23135e42d02ffc8c876030053ecd12663c65af