Merge "Expose _id in ExtendedProperties subValues" into froyo