android issue 36