Change-Id: I9db1aac350cd2ca02cceccc249ebd2f0b3c3c671
Improves license compatibility between GPL and Apache Change-Id: I2b165aa575bb6213af6b07936f99610c113443f0