Merge "Use lowercase bdaddr and fix improper string compare in Volume Manager"