Merge "Fix missing exported=true in manifest." into sc-dev