Merge branch 'master' into gatt-helper
Fix for Android L
Revert "Fix for Android L"

This reverts commit 5dec27c333451d96abeeecbc9c49eefa7ebda51c.
Revert "Revert "Fix for Android L""

This reverts commit 5d032cc6720fdf410a62563d7de77c9ef0aa992f.
Merge pull request #145 from schilit/gatt-helper

Fix for android L
LGTM. Merging.