Merge proposals dependent on lp://staging/osso-af-utils

lp://staging/osso-af-utils has no merge proposals.