Merge "Remove dummy subscription ids"
am: 22d12411fd

Change-Id: I107462d3037bc0ced691ceaf3aa625ca2434dd1c