Raise NotImplementedError instead of NotImplemented

Change-Id: I6ba5e21c801f724f216298d383a523f7dd865d6a
Merge "Raise NotImplementedError instead of NotImplemented"