Merge "Break apart queries to getInstalled* API" into gingerbread