Change to getSubscriptionId
am: 0c6fe60ca7

Change-Id: Iffa74767b95dc93f521b657e884e96513f6f9cb5