Merge "Zen: Tweak default automatic rules." into mnc-dev