Merge "Added config_data_capable flag" am: 89d5fcfb97 am: 6f193806e9

Change-Id: I7cc791338ca2d44f4ba2b8fd59238d75afe265f4