Null check

Change-Id: Iace51ac973908b5ac8b749b689d3fb360834fd60
Merge branch 'cm-10.1' into CM10.1