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

Change-Id: Ie3b95683a63dcae706a2d7f2b2d208b764b58014