Add missing files

Change-Id: I57b5f30cbbaed24b7d779a65cad1b8403b5fb54e
Test open-source counterparts

Change-Id: I5c6b821611c9768e78c824517849f891fd0ad0c7