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

Change-Id: I275df43deb93de8b228484fe164e11227ab95311