Merge "DO NOT MERGE Use SubscriptionController api to set display name" am:...
Merge "DO NOT MERGE Use SubscriptionController api to set display name" am: ba64b965 -s ours am: 53382ab7
am: 33d4209c -s ours
Change-Id: I9d9f2376230a902d2ae46c63c81597d1d5b4e217