serrano: Sync some stuff with CAF, and some minor cleanup

Change-Id: Ie93616defebc65efe1efec9e321dc2ce4d2b2991