Add missing resolutions for existing icon (from AOSP)
Merge branch 'release' into upstream
Import Google Play Services
Initialize Google Play Services
Use the Google Play fused location service when available