Add missing __init__.py's

Change-Id: Ifaea6a1ef28c14ffe0bcc4e0abb689fe03b342bd
Merge "Add missing __init__.py's"