Merge "Change getDeclaredFieldsUnchecked call to new return value"