Android fix after merge.