Merge "Include data scheme when registering for package_* broadcasts." into rvc-dev am: 606626e0 am: 3641d900 Change-Id: I3dee14482fe5116be6f8eca964f9363532927b69