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

Change-Id: I9a5fa667954c9a350356bddd6ba7f8b8193bf4b8