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