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

Change-Id: Id4e74c6d2f673cfbe2f913f7a2494c0970f33e6d