Merge "Clarify that reserved function pointers has to be set to null" into oc-dev
am: 6b6f3f7aa6

Change-Id: Ic7ebe4af8e500089b2737c60d7406d7475e24dc1