Add missing NULL sentinel.

Change-Id: I95b86d8e60d54a54280dae89ab93ff7eb322fe18
Merge branch 'cm-10.1' into martincz