Submodules shenanigans

Change-Id: Ia3165eb56c8fefeb1800d072e28daea54b9ad4de