Merge "Added config_data_capable flag" am: 89d5fcfb97

Change-Id: I22793de2970f3f6a4a71502e79fd7c785f5859ca