Merge commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3' into eclair-plus-aosp * commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3': Add Annotation for optional features.
Merge commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3' into eclair-plus-aosp * commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3': Add Annotation for optional features.