Merge "Do not deference before null check" into gingerbread