Fixes for handling of "requires=" value

Change-Id: I92fdee8125f7d647c3ca911bd5e6991d167b490d