Use the *_up_ref functions always

Change-Id: Ic6002f364bcae802fc1c007bb86504bc36897882
1 file changed