Merge "Disable minion_id_caching"