Merged upstream btstack SVN revision 2726.