Merge "Shorten LOG_TAGs to fit in 23 characters as commented on by lint."