add patch to set data subscription normaly

Change-Id: I67d691c9fdee3954aa8756f5efca4e4cecc3f2ce