Also allow legacy behaviors

Change-Id: I88ab8e0191e67fb09f9a271190993592fcab0484
1 file changed