d6bd6ae769
Fixes: 325084350 Test: run the unit test without guarding the flag, make sure it passes Change-Id: If902aeb7e9f06bfa4fa2876995cb67e350839a91