Lining up with upcoming Android implementation