Merge "Correct offline license handling am: 1857da2c8c am: 2efd7d71fa" into oc-dr1-dev-plus-aosp
am: 119789fd2d
Change-Id: I787e933e69ca4240674ee548b1ef12d92cdc94e1
This commit is contained in: