Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-plus-aosp * commit 'e16113998bb10f39ee1384bfc497aceeeb193440': docs for ESR: add docs to bluetooth explainin that discovery should