Merge "Update platform manifest" into sc-dev