Raise NotImplementedError instead of NotImplemented

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