Merge "Implement support for help library b/12068507" into ub-mail-master