Merge "Post-O. Move VMS property to hal 2.1."