Merge changes from topic 'device_version_cleanup' into oc-dev
am: 3176e6ebb9

Change-Id: I02d4b35bd0e74c5569de7425ea1baaab0cde45f9