Merge "Some new ICS target SDK changes."