Merge "Move product specific strings to res-product"