Merge "Make isDataCapable a public API"