[automerger skipped] Merge "Remove dummy subscription ids" am: 22d12411fd am: f7a5ef5caa
am: 75418ebfe2  -s ours

Change-Id: I6dd5f2ea38f7a9720ebe71ca4e0ae61729b83429