Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread