AOSP fix again and removed some newlines.