Merge "os-release.d: set the default version to four numbers." am: 80e0678406
am: 65f9088af1

Change-Id: I44152b354f0b872ef5b0c54bf4ac13496742cfbc