Merge "DO NOT MERGE: Add empty stubs for framework-connectivity-t" into sc-mainline-prod