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

Change-Id: Ibaba7d54ce393f2212df3f05b8929b445ccba912