Fix breaking VMS tests in O.MR1.
am: 3cf436b313

Change-Id: I49b7c7c0d81721cbf8524dba7ea81be3670618d2