Fix for editing OS version alias.

Bug: 975644
Change-Id: I21724b80d43fe91f2b265cac93a380fbcfb44772
Merge "Fix for editing OS version alias." into develop