ulsfo return: OIT + generic-AP

Change-Id: Ic80a53d6ff29b6d71939c595e52529f4b15a0dc3