Merged upstream btstack SVN revision 2716.