Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: ea944065a1 am: 20f35baf2e am: 1c6aa9c125
Change-Id: If6920f4ec1f33722215ac0d1cb3ab66a6834670e
This commit is contained in: