YU HAVE TOO MANY NULL?!

Change-Id: I37848ed2cc2042569f830d22e8747c959086f91e
Merge "YU HAVE TOO MANY NULL?!" into jb42