Merge \"Opt-in VVM3 for OEMs\" into nyc-mr1-dev
am: e9615aa89d

Change-Id: I279563b8a573bca95c0702a389d0f89888e17c69