Fixes and update to android L
Merge