Updated for interface

Change-Id: Ie99ee12a8b88e99a8c596ffb6ae318186870e351