Merge "Fix VTS failures on tests with optional inputs" into oc-mr1-dev am: 0c7d0a9d0d
am: d995459bb4

Change-Id: Ie15c912ff975f17db67253ef6c23e98d1c031c2c