Merge commit 'd2f813c3f85060d42744be2632fed20f520001ee' into eclair-mr2-plus-aosp * commit 'd2f813c3f85060d42744be2632fed20f520001ee': Add unit tests.
Merge commit 'd2f813c3f85060d42744be2632fed20f520001ee' into eclair-mr2-plus-aosp * commit 'd2f813c3f85060d42744be2632fed20f520001ee': Add unit tests.