[Nostalgia] Register extension

Change-Id: I469e26e67e2bb421cd4050b5a8bc562e4505d27f
Merge "[Nostalgia] Register extension"