Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev