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