Better 'provided' scope

Change-Id: Ic76ddeda011895e34ba7bd8a7089be0e9d707c51