Closes #1076
Issue #103 Change-Id: I67945c8ec6d2c178494d3b5400e5ec0170e9d115
License Service. Change-Id: Icb1af3fd26a5243293dd089888d4b396539fd768