Align Android implementation with modified API xml