Merge "Revert "Use implicit null checks inside try blocks.""