Merge "Fixing null pointer b/4962091"