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

Change-Id: Id75fbf587b59623b8c4ced6f108f880724362210