Merge "Remove dummy subscription ids" am: 22d12411fd
am: f7a5ef5caa

Change-Id: Id0a69db7c6668770361b6df58eef8d1a082ceca4