Merge "Remove FRIEND_TEST declarations"