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

Change-Id: I3ff7e1b9706383df7e42aa0554c30a259b719a39