Merge \"Pinner configuration for Volantis\" into nyc-dev
am: 208a4349ea

Change-Id: Ia1089eb18cfdce0692691177aa300b1acaf58c7b