Merge "  Initial contribution from Sony Corporation."