Android 6.0.1 Release 60 (MOB30Y)
Merge "Fix directory path for CarrierConfig overlay for deb." into mnc-dev