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

Change-Id: I2f4cd8865526f352967ff2a5aad356ccdc8b681d