Merge commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48' into eclair-plus-aosp * commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48': Change handling of remoteUuids.
Merge commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48' into eclair-plus-aosp * commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48': Change handling of remoteUuids.