Merge "Don't send non-existent system keys." into gingerbread