Email: merge aosp strings