Merge "Restore VVM config for Orange France" into nyc-mr1-dev am: af065b635f
am: 02d03f06a9

Change-Id: I6a3c88cfa79c688926569af52f3a34e9d8431756