Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp * commit '739cdab7cb63d53440bb411fa2d558e2114b4c81': Do not deference before null check
Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp * commit '739cdab7cb63d53440bb411fa2d558e2114b4c81': Do not deference before null check