Merge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8  -s ours
am: 34fe9136c6

Change-Id: I01c8d25555d6a71e552137d74a0b500d79df7e87