Merge "update L photo size name with JPN_ prefix"