Use usage_required decorator consistantly.

Change-Id: Ia3d0bc73ca1c7cea62b20d6b3401e9d6b4016352