Merge "Add more context for CHECKs"