[automerger skipped] Merge "Added config_data_capable flag" am: 89d5fcfb97 am: 6f193806e9 am: 178d38344e -s ours
am skip reason: Change-Id I19ac83f5865e8763cd9414c41d4609f79d0db164 with SHA-1 d47f1c439d is in history

Change-Id: I9d8e4296eb942e4c8e9f4c32de8dd2d6e22713c0