Merge "replace CURRENT_OR_SELF with non hidden API"