am fa8b5a1d: am 3f60edae: am c12571d0: am ee756cff: am 21fa0866: (-s ours) Merge "Allow authority to be set from build configuration - DO NOT MERGE" into ub-deskclock-business
* commit 'fa8b5a1d':
Allow authority to be set from build configuration - DO NOT MERGE