Correct code placement for different license

Previous code revising moved some code into a file with different license.
Fix it in this patch.

Test: ./tests/run_tests.sh
Change-Id: Ie50000bba7a6bf8d9d65dcc1a1cf21135ac3b97a