Merge "Usage license handling corrections" into oc-dev am: c3cdb531d4
am: ab0cb541d0
Change-Id: I63c3503d9021e5ab7e9fb21c0b38efaa431bff73
This commit is contained in:
c3cdb531d4
am: ab0cb541d0
Change-Id: I63c3503d9021e5ab7e9fb21c0b38efaa431bff73