Revert "Revert "Fix for Android L""

This reverts commit 5d032cc6720fdf410a62563d7de77c9ef0aa992f.