merged changes from bandroidx

merged changes from bandroidx