Merge "logd: enforce policy integrity"