upstream fixes as well as some group permission fixes, as Bluetooth group names have changed.

Change-Id: Ib91c611fbeaeef0a28df34bd5b92864569c2051c