Initial for Android L
more changes
More fixes added