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

Change-Id: I9c30b760626671f38a604149834da2cc8e547b80