Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2