am 8abcce1f: am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo