Merge "Provide defaults and annotations for LocationListener"