Fix breaking VMS tests in O.MR1. am: 3cf436b313
am: b873997937  -s ours

Change-Id: Ied3479c229784d660d93a320f352a0a3129db18b