And rename subId to subscriptionId. Test: Treehugger Bug: 113072551 Change-Id: I4bdf705d7f81bad423ed867972fd1ed7fe5717d0