We have clouds in the wild that do both - so we should test that we do the right thing on both. Change-Id: Ib4092299e1258ae7c8f75af104806cebc8d10e52
Change-Id: I1cf58e6a4cf728c5d2a32d602d9dfae1d4dfd62c