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