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

Change-Id: I48a637d66389d68cb35881ec8db82a4ce9e3a71f