Merge commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp * commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a': A couple small settings fixes:
Merge commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp * commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a': A couple small settings fixes: