Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev am: c21f723ca2
am: 977cbc6690

Change-Id: Ibc07c8b9b614e5fbfc1fbedd609f45f1a2fe7398